win32 theme: Always include the win32 theme
authorBenjamin Otte <otte@redhat.com>
Mon, 15 Feb 2016 23:22:12 +0000 (00:22 +0100)
committerBenjamin Otte <otte@redhat.com>
Tue, 16 Feb 2016 01:53:33 +0000 (02:53 +0100)
It's not very useful outside of Windows so far, but that will hopefully
change.

gtk/Makefile.am

index 944ddec57c5cc06b18f95bd188a7963f834be54d..566ec95e40276d13416933a69a4b0cdcc86c5838 100644 (file)
@@ -1238,10 +1238,8 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
        echo "    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
        echo "    <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
        echo "    <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
-       if test "$(win32_theme)" = "yes"; then \
-         echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
-         echo "    <file>theme/win32/gtk.css</file>" >> $@; \
-       fi; \
+       echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
+       echo "    <file>theme/win32/gtk.css</file>" >> $@; \
        for f in $(srcdir)/cursor/*.png; do \
          n=`basename $$f`; \
          echo "    <file>cursor/$$n</file>" >> $@; \
@@ -1367,7 +1365,6 @@ libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-win32_theme = yes
 libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
 libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)